From 78c4acbee4aa3628ba329cfc8e84c7cb2af5b3b2 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 30 Aug 2006 19:48:45 +0000
Subject: [PATCH] Minor gbfile changes.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2331 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/gbfile.c | 2 +-
 gpsbabel/gbfile.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gpsbabel/gbfile.c b/gpsbabel/gbfile.c
index 57fb40fda..8a457f917 100644
--- a/gpsbabel/gbfile.c
+++ b/gpsbabel/gbfile.c
@@ -40,7 +40,7 @@
 #endif
 
 #define MYNAME "gbfile"
-#define NO_ZLIB "No zlib support"
+#define NO_ZLIB MYNAME ": No zlib support\n."
 
 /* About the ZLIB_INHIBITED stuff:
  * 
diff --git a/gpsbabel/gbfile.h b/gpsbabel/gbfile.h
index 644430805..596e9c2c5 100644
--- a/gpsbabel/gbfile.h
+++ b/gpsbabel/gbfile.h
@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include "defs.h"
-#include "zlib/zlib.h"
 #include <stdarg.h>
 
 typedef struct gbfile_s {
@@ -34,7 +33,9 @@ typedef struct gbfile_s {
 #endif
 	union {
 	  FILE *std;
+#if !ZLIB_INHIBITED
 	  gzFile *gz;
+#endif
 	} handle;
 	char   *name;
 	char   *module;
-- 
2.30.2